e4cc02105513264c65e4c572a4b3a77919cad58b,portal-impl/src/com/liferay/portlet/journal/service/impl/JournalFeedLocalServiceImpl.java,JournalFeedLocalServiceImpl,isValidStructureField,#number#String#String#,333

Before Change


			Map<String, DDMFormField> ddmFormFieldsMap =
				ddmForm.getDDMFormFieldsMap(true);

			return ddmFormFieldsMap.containsKey(contentField);
		}
		catch (Exception e) {
			_log.error(e, e);

After Change


			Map<String, DDMFormField> ddmFormFieldsMap =
				ddmForm.getDDMFormFieldsMap(false);

			if (ddmFormFieldsMap.containsKey(contentField)) {
				return true;
			}
			else {
				int selectAndRadioFieldsCounter = 0;

				for (DDMFormField ddmFormField : ddmFormFieldsMap.values()) {
					String ddmFormFieldType = ddmFormField.getType();

					if (ddmFormFieldType.equals("select") ||
						ddmFormFieldType.equals("radio")) {

						selectAndRadioFieldsCounter++;

						DDMFormFieldOptions ddmFormFieldOptions =
							ddmFormField.getDDMFormFieldOptions();

						for (String optionValue :
							ddmFormFieldOptions.getOptionsValues()) {

							Locale locale =
								LocaleThreadLocal.getThemeDisplayLocale();

							String optionLabel =
								ddmFormFieldOptions.
									getOptionLabels(optionValue).
										getString(locale);

							String optionLabelFormatted =
								optionLabel + StringPool.UNDERLINE +
									selectAndRadioFieldsCounter;

							if (optionLabelFormatted.equals(contentField)) {
								return true;
							}
						}
					}